From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Thu, 10 May 2001 20:23:20 +0000 (+0000)
Subject: (smerge-mode): Force font-lock-multiline to t.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~40364
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=dc663438b362c1d3703fea940ad6bb329a7c9b57;p=emacs.git

(smerge-mode): Force font-lock-multiline to t.
---

diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el
index 538ff11519a..5c8af81b492 100644
--- a/lisp/smerge-mode.el
+++ b/lisp/smerge-mode.el
@@ -4,7 +4,7 @@
 
 ;; Author: Stefan Monnier <monnier@cs.yale.edu>
 ;; Keywords: merge diff3 cvs conflict
-;; Revision: $Id: smerge-mode.el,v 1.11 2001/01/25 15:36:32 monnier Exp $
+;; Revision: $Id: smerge-mode.el,v 1.12 2001/03/07 00:16:29 monnier Exp $
 
 ;; This file is part of GNU Emacs.
 
@@ -466,6 +466,7 @@ The point is moved to the end of the conflict."
 \\{smerge-mode-map}"
   nil " SMerge" nil
   (when font-lock-mode
+    (set (make-local-variable 'font-lock-multiline) t)
     (save-excursion
       (if smerge-mode
 	  (font-lock-add-keywords nil smerge-font-lock-keywords 'append)